commit df60f4409384e4dae19a65f0415211f240f370d8
author Junio C Hamano <junio@hera.kernel.org> Wed Feb 07 05:52:37 2007
committer Junio C Hamano <junio@hera.kernel.org> Wed Feb 07 05:52:37 2007
tree 00f326bdcab29d477782d8ee88da067ab93e30bd
parent 42f855f6b85e5aa6ebce69b4ac12e4c8f33276a4

Autogenerated HTML docs for v1.5.0-rc3-175-g6506 

git-resolve.html

diff --git a/git-resolve.html b/git-resolve.html index 2d2daac..9ea8e6e 100644 --- a/git-resolve.html +++ b/git-resolve.html @@ -276,7 +276,7 @@  </div>   <h2>DESCRIPTION</h2>   <div class="sectionbody">  -<p>DEPRECATED. Use <tt>git-merge</tt> instead.</p>  +<p>DEPRECATED and will be removed in 1.5.1. Use <tt>git-merge</tt> instead.</p>   <p>Given two commits and a merge message, merge the &lt;merged&gt; commit   into &lt;current&gt; commit, with the commit log message &lt;message&gt;.</p>   <p>When &lt;current&gt; is a descendant of &lt;merged&gt;, or &lt;current&gt; is an  @@ -299,7 +299,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 17-Jan-2007 23:27:40 UTC  +Last updated 07-Feb-2007 05:52:26 UTC   </div>   </div>   </body>